projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f66a0f3 172b666)
bitkeeper revision 1.1159.183.6 (41a27165T3EZZHjH8ZvXRFHh8WInHQ)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Mon, 22 Nov 2004 23:08:21 +0000 (23:08 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Mon, 22 Nov 2004 23:08:21 +0000 (23:08 +0000)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
Unnamed repository; edit this file 'description' to name the repository.